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

Change-Id: I7ee3fc1c3616a575eaf893f2bc709b063f674e31