Update submodules.
Merge changes from iOS version.
Misc. tweaks to selecting a note.
Cleanup.