Merge "Use conditional stroke color for taskbak overflow entrypoint" into main