Merge "mm-video-v4l2: Adjust p-frame count if b-frame count is modified"