Merge "Fix taskbar_expand/collapse jank monitor" into main