Merge "Allow Camera.setDisplayOrientation to be called when preview is active."