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

Change-Id: I0ce526da99b8c99be900bc98b1566ff36fd06904