Merge "Fix overlap of text and star in controls" into rvc-dev am: 9b77b19311

Change-Id: Icb75048a3c6bb3c1e20d12f7efb16ca59dec5d83