Fixed tab display behavior for shadow toggle
Merge branch 'bugfix/shadow-on-tab-behavior' into develop