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

Change-Id: Id52f78751ced368a8119abe8594982d289416da2