Merge "Controls UI - Remove stale references to prevent memory leak"