Merge "Fix tab in Settings and landscape mode." into tm-dev