Merge "Don't set udfps icon visibility on illumination change" into sc-dev