Merge "Don't lose content change during rollback for loader already started" into nyc-dev