Merge "Fix padding on Font size and Display size preview screens. Bug: 27675989" into nyc-dev