Merge "Reset FontMetrics at each new measurement in BoringLayout" into nyc-dev