Merge "Update UI for support tab." into nyc-mr1-dev