Bug 809094 - Move data upload choices to Advanced pref pane, add FHR option; r=gavin, gps