Merge "Don't mix UI and print job state" into nyc-dev