Merge "FingerprintDialogView sets visibility incorrectly" into pi-dev