Merge "Use animateClose in TaksMenuView even without animation" into main