Merge "Remove delay from enroll start button"