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

Change-Id: Ib2d2b942d465f535ab1d4721071f4f53f1d5470a