Merge "Address API feedback on theft detection API" into main