Merge "Refactoring: Remove unused parameter from topRunningActivityLocked."