Merge "Clean up message dispatch in FingerprintService"