Merge "Send EXTRA_TIME with PACKAGE_RESTARTED broadcast" into main