Merge "SF: hwvsync on for more samples on recalibration"