Merge "Merging  ub-launcher3-qt-dev, build 5656472 am: 0e57817adc am: ae81279a02" into qt-r1-dev-plus-aosp