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

Change-Id: I9e5ee0d22f38f7de72a6ace9f01b523dc406743d