Moved the rotation hack to the CameraActivity