Merge "camera2: CameraDevice#configureOutputs now deletes unused streams" into klp-dev