Gosh! U're lucky!
I've just updated my Note 4 with T-mobile yesterday. The annoying default setting drive me nut! It made me to do the research, and now i found this article. I follow the step u showed above, however there is no such thing with T-mobile update.
When I called t-mobile...