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

Change-Id: Ied862d7863d3e39036cc9084c89bf41292d70f1f