Merge "Add a conditional wait for file switching in MPEG4Writer." into main