Merge "Tablet Settings Layout is no longer stretched" into nyc-mr1-dev am: 6cafff3b2c
am: 493350dcf7
am: 7d79557c56
Change-Id: I0f5cb93802bea6f7f5af9e586a65d7e6a6a42d8c
This commit is contained in: