Merge "Check for null surface control before setting transform hint"