Merge "PointerController: Cleanup after PointerChoreogpraher refactor" into main