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

Change-Id: Ie1568a0787cd62af59dcde31623573ea84fe5e81