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

Change-Id: I955e168a1f7b3e64d6442ecbe181b30c460f5446