am ccdbd1d0: am a3d9d5f7: am 7c7fb03f: am 56317010: am 7ce4c33e: Merge "Camera: make sure preview won\'t slow down video" into mnc-dev

* commit 'ccdbd1d0de74e97a4cb1514db35da1ff838e2f29':
  Camera: make sure preview won't slow down video