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

Change-Id: Ibed9166730399fed95e18316bb33695c091fa794