Merge "Always update lockscreen UDFPS icon's progress" into tm-dev