Merge "SysUI filters fingerprint errors from keyguard" into tm-qpr-dev