Merge "Handle onUserStopped to lock the user storage again" into main