am f0a6b8bc: am 72a2f171: Merge "Camera: setCallBackWindow only if callback surface is used" into klp-dev

* commit 'f0a6b8bcb22a742318c46d51b4343a64acf94900':
  Camera: setCallBackWindow only if callback surface is used