Use control
borders for subnav + disabled button fix
#2643
Merged
control
borders for subnav + disabled button fix
#2643