Merge "Improvements to TaskbarDividerPopupView" into main