Merge "Do not change strong auth for users stopped with delayed locking" into main