Merge "Settings: Respect preference's visibility in VideoPreferenceController"
am: 0e40f46fe2

Change-Id: Iecf7610d41896a5fa0ae7d6aa0ca0de75463eb7e