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

Change-Id: Idcc1eb34ad0df71379b0689728d5304cda3bcf43