am edc3f3f3: am b52b6bf1: Merge "Fix issue #7295951: Mako asks which Launcher...
am edc3f3f3: am b52b6bf1: Merge "Fix issue #7295951: Mako asks which Launcher to use at every re-boot" into jb-mr1-dev
* commit 'edc3f3f3':
Fix issue #7295951: Mako asks which Launcher to use at every re-boot