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

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