Merge "PersistentDataBlockService waits for MainUser"