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

Change-Id: Idc6b35aee25590c09d0627874d4245b76b85b439