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

Change-Id: I0ade684973be43a8c29b30c2e5bc9cdc6d5cbaf8