Harden client entry and frame boundary reconciliation (#11688)