Merging ub-launcher3-qt-dev, build 5697268
am: a0967d21e6

Change-Id: I90471834864a28606133a979871b4c69179333d9