Merge "Start primary storage move outside lock." into nyc-dev