Merge "Fix repeated surface timestamp condition" into main