Merge "Update language in AppStateTracker to be more inclusive"