Merge "Use correct timeout when gating sync transaction" into tm-dev