Merge "Fix an issue that the syncTimestampToDisplayLocked incorrect" into tm-qpr-dev