Merging from ub-launcher3-rvc-dev @ build 6418896 am: df280add9e am: 3aa30d3d33 am: 52846c4ca7 am: cf7b09feac

Change-Id: I04e0a4aba48a3a420d5dbc0ab7b8aadb70f4f8c7