Merge "CCodec: don't update pipeline watcher if using input surface"