Merge "add correct background to tab switcher"