Merge "Revert "Split attachApplication to more accurately identify app startup""