Merging ub-launcher3-qt-r1-dev, build 5758528
am: 574d6c152c

Change-Id: Ia3daf20eb75efc8b8c1c93683265721e7435bae5