Merge "Add controls rearrange activity" into rvc-dev am: 0935694b5a am: 7b4a6a8e4d am: 4c73a2c25c

Change-Id: I85c70e6017efd0653db7e5dd6363fe710c90c6aa