Merge "Prevent PrintSpooler from being disabled" into nyc-mr1-dev