Merge "Disable autofill while user setup is not completed." into oc-dev