Merge "Prevent speculative execution past ERET" into integration