Story 46958675: Auto-mapping newly created control in mapping dialog