Merge "Allow deferred SUW to add multiple fingerprints" into tm-dev