Merge "fix close tab keyboard shortcut"