Merging from ub-launcher3-rvc-dev @ build 6538292 am: d67be77066 am: 2f02c55f1e am: 6d22f255ca

Change-Id: Iefa487a137b28b09e995263073969a3f67a84340