Merge "Polish FingerprintDialog" into pi-dev