Merge "Fix font and display size settings pages for small screens." into nyc-mr1-dev