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

Change-Id: I8ce3a6d23ba9eea17592aea40c21ae926cb65d02