Merge "Theme tests for Material" into mnc-dev