Merge "msm: camera2: cpp: Enhance timeout handler for multi-frame processing"