Merge "Fix issue #7295951: Mako asks which Launcher to use at every re-boot" into jb-mr1-dev