Merge "Add method to show/hide preference in base controller"