Merge "Fingerprint user canceled message should not be delayed" into pi-dev