Merge "Merging ub-launcher3-qt-r1-dev, build 5782058 am: c128131a10 am: 530b284a90" into qt-qpr1-dev-plus-aosp
am: cfb3bc4834

Change-Id: I5cf5abd22b303140c7f37f5a68bfdc72848c21ad