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

Change-Id: I9680dc02dc96fc324b019c027d08271fb27b4506