Bug 971624 - [settings] refactor marionette test for do not track panel
Bug 973436 - Refactor the battery panel using AMD modules
Merge pull request #17913 from crh0716/973436

Bug 973436 - Refactor the battery panel using AMD modules r=evelyn
Bug 990580 - Increase workaround to 10s a=testonly
Merge pull request #18013 from EragonJ/bug-971624

Bug 971624 - [settings] refactor marionette test for do not track panel