#659 When canceling option edit mode, restoring flag's "use default value" value