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

Change-Id: I39e2656745d68475296436d46fc97d3217536f49