Merge "Log FP & face enrollment state only if it changes." into tm-qpr-dev