Issue #2209063: Fix the flicker of the "active" icons when a high-latency user clicks on toolbar items