Merge "Fixing Material Tokens inheriting  wrong theme" into udc-dev