Merge "fix tab bar layout bug" into honeycomb