Merge "SF: Fix feedback loop with refresh rate overlay" into tm-dev