Merge "Make sure biometric icon ends in authenticated state" into qt-dev