Merge "Merging from ub-launcher3-rvc-dev @ build 6396980" into rvc-dev am: ce6f43f0df am: 2e9cdc6e40

Change-Id: I343468871612f89bd82a55c7e830264a274a503d