Merge "Fix the 1st udfps#enroll#error always fill red color"