Merging from ub-launcher3-rvc-dev @ build 6436292 am: 82902c0da6 am: afdae84544 am: 130cd74716 am: 38276df530

Change-Id: Iab04765eb8f870d0535c9a9afdd70d48bea68448