change to fix cropping inSample scale, rotation issues with s5