Merge "Add null check in displayPreference"