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

Change-Id: I638d9517ef210902ca12aa7d3e0146be14761524