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

Change-Id: I77be1ace63c71f85f5be2355c28be143ebc2b1e7