Wait for visibility to change before update menu.
Merge remote-tracking branch 'ivan-github/bug/3821_inconsistent-hide-show' into develop