Merge "Revert "Ensure that resetStateLocked is called"" into main