Merge "camera: Start/stop preview before clearing surface."