Merging ub-launcher3-qt-dev, build 5633311 am: a3ed49d566 am: 83070095a5
am: 6a6238e30a

Change-Id: I028cc49f3a866c124c63ad8a8158256cc0c91839