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

Change-Id: I3d07bc8babaa15aef48592fcbe81f940f5910c49