Merge "Remove _light / _dark / from "fixed" sys resources" into udc-dev