Merge "Add controls rearrange activity" into rvc-dev am: 0935694b5a am: a11c2b91af

Change-Id: I409da2cad9ae8f676e48fb33fbefd458d9756339