Merge "Set minimum height for preview screen of font/display size settings Bug: 27699996" into nyc-dev