Don't hide sync settings, v2 (cleaner)

Bug:19961809
Change-Id: I02d6bd773dc20112c8fa3b83ac305d0cdbbd58d0
3 files changed