Merge "Camera3: Use Stream Identity instead of Stream type" into klp-dev