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

Change-Id: I52d23d6355eae192e33b0def61914de37be63a9d