d2: camera: Finish fixing video enable/disable sequence

Change-Id: Id03a18aec8acafc78d018b09f23b7f924ff5083e