Merge "Fixing jank when transition from print dialog to generating one." into klp-dev