Merge "Add the "timers: do not raise softirq unconditionally" temporarily"