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

Change-Id: Ic00c13448c5dc83b91c0291e649abe9ad33baff7