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

Change-Id: I6404160b5243848ab73a93ecc3e84d549f0385a1