Merge "Controls a11y - Various fixes" into rvc-dev am: e389091b2d

Change-Id: Ibad7bb07714d9ab4a4e9339b133a0be837bfed51