Merge "Don't show fingerprint cancellation messages in keyguard" into mnc-dev