Merge "Merging ub-launcher3-qt-r1-dev, build 5759495 am: 77db8d0669 am: 24ae37ca15" into qt-qpr1-dev-plus-aosp