Merge "Fix the logic to get tv_pip_settings_class_name"