Merge "Move strings to SettingsLib so TV can use them" into oc-dev