Merge "Add flag for caption inset conversion for app compat" into main