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

Change-Id: I6d490f8d51fd10ef6fe2b4e9bdf3c222fb4c8de6