Merge "Add incognito and snapshot icons to tab switcher"