Merge "Fix memory leak in TopLevelBatteryPreferenceController"