Merge "Add controls rearrange activity" into rvc-dev