Merging ub-launcher3-qt-dev, build 5642962 am: 0ea61abe10
am: 5c4ca99462

Change-Id: I75ecdbfba833f1de5494a22621a56dc5303d6dc7