Merge "Skip task overlay in calcuating task description" into pi-dev