Merge "Merging ub-launcher3-qt-r1-dev, build 5766606 am: 8822dc0018 am: c361bb8977" into qt-qpr1-dev-plus-aosp
am: a61fd0087b

Change-Id: Iacfeaf56f5b8237d5891a87b3ae0e94205724fd0