Merge "Controls UI - Motion for activities" into rvc-dev am: 5cbc7dace2

Change-Id: I70a186d2d0abf853742247785246a0641e955afa