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

Change-Id: Iddc63c41abfa2a1274d0a6a27299098e37e960c8