Merge "Merging ub-launcher3-qt-r1-dev, build 5749827 am: 3fc9a1cf69 am: 33e8612e8c" into qt-qpr1-dev-plus-aosp