Merge "Moving AppStateTracker to apex directory"