Merge "Display setting and support in a tab layout - DO NOT MERGE" into nyc-mr1-dev am: 01f17798
am: 9fc57d0e -s ours
* commit '9fc57d0e':
Display setting and support in a tab layout - DO NOT MERGE
Change-Id: I0a40dd2e146d11faa6188685f3d4026e31e71ba5