Merge "SF: Update transform hint from current state"