Merge "Task thumbnail background is spilling to the front, making the BK 1px smaller to fix it" into tm-dev