Merge "Refactoring of the print sub-system and API clean up."