Merge changes I0b1b7285,I32d3b9af into main

* changes:
  Fix lockout not happening when auto confirm is enabled.
  Fix stale isAutoConfirmEnabled setting state.