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

Change-Id: I41b820afe196665b9ac8a385ad5c56a4873853b8