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