Merging ub-launcher3-qt-dev, build 5633311
am: a3ed49d566

Change-Id: I643bded8983912cc3a468b7cc5328c991be74faa