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

Change-Id: I82b485b9a3a17de7925ebe016d65db7271336315