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

Change-Id: I075b9d5647a9263696fd0ba03111c7ec2297c924