Fix remove !important on CSS variable declarations
#16668
Merged
!important on CSS variable declarations
#16668