Merge "Settings dashboard tablet fixes" into nyc-dev