Merge "screencap: Rotate images when display is rotated" into mnc-dev