Restore the ACTION_REDRAW case as it was before r20661 (with a slight change as sugge...