Merge "Merging ub-launcher3-qt-r1-dev, build 5781802 am: 45d5cd2c30 am: 3deb863911" into qt-qpr1-dev-plus-aosp