Merge "Clean up print subsystem"