Merge "Merging ub-launcher3-qt-dev, build 5582981 am: 90eb08d838 am: 8e0fa1ebbb" into qt-r1-dev-plus-aosp
am: 954fcae2da

Change-Id: I15718869f17435f5ec0b47f7f21035eea71fe28b