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