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

Change-Id: I9c3cf5433ed88168801834cc7ac64e0a2c7c56ad