Merge "Merging ub-launcher3-qt-r1-dev, build 5781802 am: 45d5cd2c30 am: 3deb863911" into qt-qpr1-dev-plus-aosp
am: 380edf3c7e

Change-Id: Ic6322223dc00c29dc56d63a3a89c3390c7dfc0db