Merge "Fix tab switching corner cases" into honeycomb-mr1