CLC-2797 - Resolve issue with 'Switch to CCN input' button
Merge pull request #2304 from redconfetti/CLC-2797-fix-ccn-mode

CLC-2797 - Resolve issue with 'Switch to CCN input' button