FIX: The "Add Control Scheme..." popup now requires explicit Save/Close user action (case ISXB-1131)

FIX: The "Add Control Scheme..." popup now requires explicit Save/Close user action (case ISXB-1131) #831