Merging ub-launcher3-qt-dev, build 5595491 am: cf7e6c4a32
am: d405653c86

Change-Id: Ica02365baaaab1729ccc245af1fca22ba3d2c149