Merge "Refactoring Activity Manager."