Merge "Ignore storage lock events if user does not exist" into main