Merge "Fixed autofill CTS infra so global settings are properly set." into pi-dev