Merge "Settings: Respect preference's visibility in VideoPreferenceController"