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

Change-Id: I77c1b06920dff8df6846937d62b74ac8f12daaa5