Merge "Clear TaskbarDividerPopupView callback upon closing" into main