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

Change-Id: Iccae997fc2c7e41685f7b45ec0938a044d599c27