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

Change-Id: I5d8923149ce0dc0f89768f07891b4a4213a63aa5