Merge "registration: Don't initialize MWServices super early"