Merge "SF: Clean up updateTransformHint() processing." into pi-dev