Merge "Remove onHandleUserStop from PackageMonitor" into main