Merge "PaintMeasureTextTest: only pause/resume not_cached benchmarks" into oc-mr1-dev