Merge "Prevent PrintRegistry callbacks when finishing" into nyc-mr1-dev