Merge "Fix FingerprintDialogView when show is called before animation is complete" into pi-dev