Merge "Controls UI - Reuse behaviors"