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