Merge "Camera: adjust inflight list warning threshold" into oc-dr1-dev