Merge "change app tab behavior" into honeycomb-mr1