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

Change-Id: Ied2a03e9cbd92a28ddd89c6d86cd970bf9c64d51