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

Change-Id: I0cdc0d6a6e063611c9f745f26a74e01c7cecb218