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

Change-Id: I700a33551b4de0bc72dde6dc80b8766b58c6a66a