Merge "Avoid using !important and hide the nolabel instead"