Merge "Ignore errors preparing user storage for existing users" into snap-temp-L01900000954560285