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

Change-Id: Ic09c9af1c63be028a0709915fb136ce3bee35ac2