Merge "msm: camera2: cpp: support skip of error frames"