Merging ub-launcher3-qt-dev, build 5697268 am: a0967d21e6
am: e303383f77

Change-Id: I0fd9c7e3603f9cd373516c87866dc92cdc5b17ea