Merge "Material Widget styling" into lmp-dev