Merge "Fix theme for package uninstall dialog" into main