Merge "Merging ub-launcher3-qt-r1-dev, build 5758528 am: 574d6c152c am: 5d8f532486" into qt-qpr1-dev-plus-aosp