Merge "Get color state list file content from PSI instead of disk" into mnc-ub-dev