Fix COD warning when you have hide shipping methods until address entered selected
Code standards for #4856
Changelog bump for #4856