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

Change-Id: I9a16b1df189b49c4021357606763b47168757ab0