Merging ub-launcher3-qt-dev, build 5595491 am: cf7e6c4a32
am: 3f45e292eb

Change-Id: I3c222fb9ae04bb3ebb1c7a4302027b036636909e