Merge "Update auto-rotate and print icons" into pi-dev