Merge "Use separate enroll timeout for fingerprint and face" into qt-r1-dev