Merge "a11y for controls management" into rvc-dev am: 4d504ec83a

Change-Id: Id6a316053ab82b1d52d35ed73c70dbfbb39f4037