Merge "a11y for controls rearranging" into rvc-dev am: dfc677f707 am: 93997d3622

Change-Id: I74e24e83441bbc80ddaf9c09d0b875f85abc9a07