Improve delayShow/delayHide behavior
#1168
+15
−0
Merged