Merge "Clean up: remove preference_category_no_title."