Merge "Don't trigger active unlock on udfps-down" into tm-dev