Merge "CTS: rewrite refresh rate measurement" into ics-mr1