Merge "fix print code to support landscape" into gb-ub-photos-carlsbad