Merge proposals dependent on lp:~sil/tomdroid/handle-non-guid-note-ids

lp:~sil/tomdroid/handle-non-guid-note-ids has no merge proposals.