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

Change-Id: I2c4a9774c2ae463ed80810dc95a298e1302f4b5f