Merge "Move Face/FingerprintManager registration calls off main thread" into main