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

Change-Id: I027fe5ffc103939c4fcb3132f029acee85d28055