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

Change-Id: I4db43bb42f0cc7d8023716677668193a7a3df359