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

Change-Id: If2f9c82bbfd8fb2e8bd86ebddb3eb2a8b21ed756