Merge "Display setting and support in a tab layout - DO NOT MERGE" into nyc-mr1-dev