Merge "Remove code that just re-enables IRQ and GIA events" into main