Merge "SF: update mTimestamps with the newest hwvsync timestamp" into sc-dev