Properly show/hide inner toolbar + border bottom for watches and selectors panel tabs (issue 7004)