Merging ub-launcher3-qt-r1-dev, build 5766606 am: 8822dc0018
am: c361bb8977

Change-Id: I3a503d6eb001778764edf298b1001dd1c8e3cf9b