Merge "Merging  ub-launcher3-qt-dev, build 5619253 am: 0ef6fe00b0 am: 077965d075" into qt-r1-dev-plus-aosp