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

Change-Id: Id10d8c793d16c012985b0931929b77365dd1c8b8