Merge "Camera3: Improve resilience to stream failures" into klp-dev