Merge "Revert "[Regional Preference] Fix subtitle overlap""