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

Change-Id: I7c3db279245e5fcef521abb2afce2b7470bb4be5