Merging ub-launcher3-qt-r1-dev, build 5706291
am: 70528c08dc

Change-Id: I09964df1efaf4977a408ffc263cc17e5a206d622