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

Change-Id: I423639c56e63caeda9d32e5e790fb21139294d86