Merge "Improve max taskbar icon count calculation" into main