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

Change-Id: I07842c283540b28e4735e57a8ae33bfc8615fd84