Merge "DO NOT MERGE Printing API changes for supporting better page layout" into klp-dev