Merge "[Regional Preference] Fix subtitle overlap"