Merge "Improve rapid-fire presses on system bar"