Merge "camera: fix frame deletion logic in mInFlightMap" into lmp-mr1-dev