Merge "Tablet Settings Layout is no longer stretched" into nyc-mr1-dev