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

Change-Id: I34d5d8e81e5def5d1da49906925080eeef8c5a34