Merge "Refactor how the print dialog activity is started." into klp-dev