Merge "SurfaceFlinger: Fixes around rotation and cropping." into pi-dev