Merge "Camera: Allow error frame number gaps" into main