Merge "Check user states exist before package add/removal"