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

Change-Id: Ic3fa0a2f25ef5af42d81a7af93f131dff9881f74