Merge "Cancel UDFPS enrollment on overlay focus loss" into tm-qpr-dev