Merge "Merging from ub-launcher3-master @ build 6552470 am: 1598484f96 am: 1e82844c8c" into rvc-qpr-dev-plus-aosp