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

Change-Id: I4b697311dc3d8ea32d7f969e385ca2e3e96588c1