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

Change-Id: Ibf35494db776be39302d21ef2ffe80102b7da9d3