Merge "Fix an issue that the syncTimestampToDisplayLocked incorrect"