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

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