Merging ub-launcher3-qt-dev, build 5691374 am: 5cd4333b5c
am: 11cacbe1ab

Change-Id: I189d0ce4b3edf8229a19956d91114a0ca3d8358b