Merge "Update userUnlockedWithBiometric on unlock changes" into tm-qpr-dev