Story 46958675: now preserving checked state of other mapped controls when adding and auto-mapping a new control