Merging ub-launcher3-qt-r1-dev, build 5749827 am: 3fc9a1cf69 am: 008145f0a8
am: 844a6f7e90

Change-Id: I24353fef93b8d57be5b13c74b1e71974578547e6