Merging ub-launcher3-qt-dev, build 5565340
am: 662f12fe62

Change-Id: I33f9f08c63fda77f1c49a557b6e3ac98b92d0e54