Merge "Listen for PACKAGE_RESET queries and events"