Merge "Camera: Try to remove inflight requests during error notifications" into oc-dev