Merge "Merging ub-launcher3-qt-dev, build 5642962 am: 0ea61abe10 am: 5c4ca99462" into qt-r1-dev-plus-aosp