Merge "Only check isTopOfTask() when needed"