Merge "Disable strong auth for all profiles after successful unlock" into main