Merge "Handle user removed for PackageMonitorCallbackHelper" into main