The changes to this file seem unrelated to moving tracking from the `MainActivity`. This should probably be a separate commit, to be done when working on something else in this class.