am 22d96ede: Merge "Fix tab switching corner cases" into honeycomb-mr1

* commit '22d96edeb1d77a76399febfd56453d1c59cf0280':
  Fix tab switching corner cases