Merge "Settings: Respect preference's visibility in VideoPreferenceController" am: 0e40f46fe2 am: 447674e100 am: 4cbb60c344
am: 54ef0fcbc0

Change-Id: I2e07ee23c26bbb9f2a08812c23d6d16e88407bf3