Merging ub-launcher3-qt-r1-dev, build 5749827
am: 3fc9a1cf69

Change-Id: Id05a484ba74b5ef29c22992e7997eabf3c523011