Merge "Revert "camera: Start/stop preview before clearing surface."" into mnc-dev