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

Change-Id: I80cba326c0c8fa9253a25de30ec8323313835747