Merge "Update the print dialog." into klp-dev