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