Merge "Remove code for seamlessly rotating SurfaceView's." into oc-dev