Merge "Handle uninstall for selected controls package" into main