Merge "Fix failing tests in AppStateTrackerTest"