Merge "ActivityTaskManagerService: clear previous if it becomes topApp"