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

Change-Id: Idca218a429c4f9727ab47a1322b87465a1b28316