Merge "Avoid calling getTopMostTask() twice in Task#fillTaskInfo()"