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

Change-Id: Id5932ec25d3997e24f8fcb97b17804a62ac99795