Merge "Controls UI - ActivityView WIP"