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