Merge pull request #1428 from matrix-israel/shachar_Feb_18_tab_menu_fixes