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

Change-Id: Ibf291eda825193cb6a062702c8fb3e381548ee33