fix tab switcher and menu

Change-Id: Ibcda8fc9fa73f11dba7d8f2f8061740910cedc55
2 files changed