Merge "Only rotate screenshots on pre-M devices." into emu-master-dev