Merge "Improve UDFPS unlock animation experience" into tm-d1-dev