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

Change-Id: I565ff3f6bb6341a823cfadc1c1a9fbffa06fec5d