Merge "Refactor reporting activity idle"