Merge "Fix memory leak in ApplicationStates"