Fix camera crash when switching between photo and video : Thanks ivanich

Change-Id: I794406a10a4f5c7eaac6626193cfa195994ac384
Merge pull request #1 from shantur/cm-11.0

Fix camera crash when switching between photo and video : Thanks ivanich