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

Change-Id: I20fb8567534d62d849ecace47eaa15236fda1139