Merge "Merging from ub-launcher3-rvc-dev @ build 6396980" into rvc-dev am: ce6f43f0df am: 2e9cdc6e40 am: a629f7adb5 am: ea883c2f5e

Change-Id: I3de08be8745d63b0efcbc08775647cfcd318470e