Merge additional APU timing hacks from upstream