Merge "Avoid "CAS updated failed" errors on Special:Preferences double post"