Merge "Tab switcher cleanup"