Corrections for submenu show while animating hide #1288, adjustments to failsafe