Merge "Add a flag for APV support in mp4 writer" into main