Merge "Support tab UI polish." into nyc-mr1-dev