Merge "Fix issues with SUW on fingerprint devices"