Merge "Controls UI - Motion for activities" into rvc-dev