Merge "snapuserd: Fix bool/int return value mismatches." into main