Merging  ub-launcher3-qt-dev, build 5505393
am: d4e8bdbc62

Change-Id: I91f1c3d4bf134226ac40111e2a0eda3ad8e1fd35