Merging  ub-launcher3-qt-dev, build 5528135 am: 4c8e5dd275
am: 93e77f6ac4

Change-Id: I86c9ead56d47fb9a22a328aef54e918511206f64