am ed49d7b5: Merge "camera3: Fix recording failure when switching resolutions while preview on" into jb-mr2-dev

* commit 'ed49d7b57e66cc2520817b345ef9de289d688bd4':
  camera3: Fix recording failure when switching resolutions while preview on