Merge "Fix Skia pipeline readback for non-portrait mode"