Merge "Merge "Merging from ub-launcher3-master @ build 6248758 am: 3210c06687 am: 20aaa198f3" into rvc-d1-dev-plus-aosp am: 35e2d9b343" into rvc-qpr-dev-plus-aosp am: 82875e629e

Change-Id: I3a2466370c872410a4325d4e7c39346ea9f6f610