Merge "Clean up AppStateTracker state on package removed"