Merge "Skip task overlay in calcuating task description" into pi-dev am: d17d5a487d
am: b11ca32c54

Change-Id: I52aa3ec9151d905008af771c77e7ba486cf870c8