Merge "Enforce strong auth for private profile on storage lock events" into main