Merge "Major refactoring on Autofill CTS timeouts."