You should avoid unrelated changes as they'll make it more difficult to have the significant changes merged upstream.