Merge "Merging from ub-launcher3-rvc-dev @ build 6541617" into rvc-dev am: 614c185e21 am: dfbe0fc1a3

Change-Id: Ia6ccd9d7e5b528d20021f62c610e3a8f8a0d3953