Merge "Only start tracking usage on first activity resume"