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

Change-Id: I696f395e9039219bf2f8bcc0b1abbc8859c23d72