Merge "Keep packagemonitor for weak reference in overlaymanagerservice" into main