fix preview/camera crash after stopping video record

After stopping a video record, the camera preview was always freezing
with the cm camera. With the google camera, the whole camera even crash and
you could not connect to the camera anymore. This commit fixes the issue.

Change-Id: Ic2b6e626e983fcd9d5c7e73ad99b27e5afd16dc7
Merge remote-tracking branch 'cm/cm-11.0' into HEAD