Merge "fix hide tab switcher"