Merge "SF: Avoid updating clients with stale or incorrect transform hints"